From a81c6629250cb09057c9d352dd55b561da4332e3 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Sun, 1 Mar 2009 14:35:57 +0000 Subject: [PATCH] x86: Relax spinlock checks during shutdown or S3. Signed-off-by: Keir Fraser --- xen/arch/x86/acpi/power.c | 2 ++ xen/arch/x86/shutdown.c | 1 + 2 files changed, 3 insertions(+) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 4eeec4ae54..4c6f76d61e 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -175,6 +175,7 @@ static int enter_state(u32 state) printk("Entering ACPI S%d state.\n", state); local_irq_save(flags); + spin_debug_disable(); if ( (error = device_power_down()) ) { @@ -208,6 +209,7 @@ static int enter_state(u32 state) printk(XENLOG_INFO "Finishing wakeup from ACPI S%d state.", state); done: + spin_debug_enable(); local_irq_restore(flags); console_end_sync(); acpi_sleep_post(state); diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index 2e8c622963..18340e5b25 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -302,6 +302,7 @@ void machine_restart(unsigned int delay_millisecs) watchdog_disable(); console_start_sync(); + spin_debug_disable(); local_irq_enable(); -- 2.30.2